Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Feb 2012 03:41:52 +0000 (19:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Feb 2012 03:41:52 +0000 (19:41 -0800)

Trivial merge